From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 16 Feb 2024 23:12:51 +0000 (+0100)
Subject: unlockDialog: Stop passing timestamp to Main.pushModal()
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~281^2~1^2~162
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=0432623fc82dedb0e62fffd9a76ad93605f9afe0;p=gnome-shell.git

unlockDialog: Stop passing timestamp to Main.pushModal()

Since the move to Clutter.grab() in commit f4cae72d17af6, the
parameter doesn't do anything anymore.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3195>
---

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 7e428623e..d2236fb90 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -427,8 +427,7 @@ export class ScreenShield extends Signals.EventEmitter {
 
             this._dialog = new constructor(this._lockDialogGroup);
 
-            let time = global.get_current_time();
-            if (!this._dialog.open(time)) {
+            if (!this._dialog.open()) {
                 // This is kind of an impossible error: we're already modal
                 // by the time we reach this...
                 log('Could not open login dialog: failed to acquire grab');
diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index 8a40845de..29240a941 100644
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -876,17 +876,14 @@ export const UnlockDialog = GObject.registerClass({
         this._authPrompt.finish(onComplete);
     }
 
-    open(timestamp) {
+    open() {
         this.show();
 
         if (this._isModal)
             return true;
 
-        let modalParams = {
-            timestamp,
-            actionMode: Shell.ActionMode.UNLOCK_SCREEN,
-        };
-        let grab = Main.pushModal(Main.uiGroup, modalParams);
+        const grab = Main.pushModal(Main.uiGroup,
+            {actionMode: Shell.ActionMode.UNLOCK_SCREEN});
         if (grab.get_seat_state() !== Clutter.GrabState.ALL) {
             Main.popModal(grab);
             return false;
@@ -902,9 +899,9 @@ export const UnlockDialog = GObject.registerClass({
         this._showPrompt();
     }
 
-    popModal(timestamp) {
+    popModal() {
         if (this._isModal) {
-            Main.popModal(this._grab, timestamp);
+            Main.popModal(this._grab);
             this._grab = null;
             this._isModal = false;
         }